Change testo sequence for stmsdf format and regenerate reference data.
authoroliskoli <oliskoli>
Tue, 1 Aug 2006 23:06:39 +0000 (23:06 +0000)
committeroliskoli <oliskoli>
Tue, 1 Aug 2006 23:06:39 +0000 (23:06 +0000)
grtcirc.c
reference/route/stmsdf-route.sdf
reference/stmsdf-example.gpx [deleted file]
reference/stmsdf.txt [new file with mode: 0644]
reference/track/stmsdf-track.sdf
stmsdf.c
testo

index 16769e654b4595c05f20236d6076b01ce4ad23cb..48c227b99ffe45049bd2e2b6509f78d32ef1ad91 100644 (file)
--- a/grtcirc.c
+++ b/grtcirc.c
@@ -109,7 +109,7 @@ double heading( double lat1, double lon1, double lat2, double lon2 ) {
 double heading_true_degrees( double lat1, double lon1, double lat2, double lon2 ) 
 {
   double h = 360.0 - DEG(heading(lat1, lon1, lat2, lon2));
-  if (h > 360) h -= 360;
+  if (h >= 360.0) h -= 360.0;
 
   return h;
 }
index b7ea01845caa6194c82826461bd5a15503e1ec3b..e6c0ab814bdb47bc91e571af90eb67c542c31767 100644 (file)
@@ -3,52 +3,16 @@ FILEVERSION=1
 SOURCE=FILE
 DATUM=WGS84
 TYPE=5
-DISTANCE=11206
-NAME=BELLEVUE
+DISTANCE=394
+NAME=NARVA to Jahnstrasse
 [POINTS]
-"WP","BELLEVUE",42.43095000,-71.10762800,23
-"WP","GATE6",42.43124000,-71.10923600,27
-"WP","PANTHRCAVE",42.43498000,-71.10994200,45
-"WP","6014MEADOW",42.43675700,-71.11322300,38
-"WP","6006",42.43901800,-71.11445600,56
-"WP","6006BLUE",42.43859400,-71.11480300,46
-"WP","5096",42.43891700,-71.11614600,45
-"WP","5066",42.43887800,-71.11927700,45
-"WP","5067",42.43922700,-71.11968900,58
-"WP","5058ROAD",42.43999300,-71.12092500,54
-"WP","5150TANK",42.44172700,-71.12167600,67
-"WP","5142",42.44390400,-71.12204400,51
-"WP","5144SUMMIT",42.44535900,-71.12284500,62
-"WP","5156",42.44729800,-71.12144700,128
-"WP","5148NANEPA",42.44976500,-71.12232000,120
-"WP","5258",42.45144200,-71.12174600,75
-"WP","5252PURPLE",42.45325600,-71.12121100,78
-"WP","527631",42.45625200,-71.11935600,79
-"WP","527614",42.45659200,-71.11967600,79
-"WP","5267OBSTAC",42.45738800,-71.11984500,74
-"WP","5278",42.45814800,-71.11913500,68
-"WP","5289",42.45937700,-71.11769300,64
-"WP","5374FIRE",42.46418300,-71.11982800,53
-"WP","5376",42.46565000,-71.11939900,56
-"WP","5376STREAM",42.46591300,-71.11932800,65
-"WP","6328",42.46711000,-71.11357400,54
-"WP","635722",42.46645900,-71.11006700,49
-"WP","635783",42.46655700,-71.10941000,49
-"WP","6373",42.46349500,-71.10711700,62
-"WP","BEAR HILL",42.46568700,-71.10736000,88
-"WP","6289",42.45998600,-71.10617000,73
-"WP","6297",42.45761600,-71.10511600,73
-"WP","6283",42.45384500,-71.10520600,67
-"WP","6280",42.45143000,-71.10541300,58
-"WP","6177",42.44844800,-71.10615800,62
-"WP","6176",42.44780400,-71.10662400,62
-"WP","6153",42.44477300,-71.10888200,63
-"WP","6171",42.44359200,-71.10630100,55
-"WP","6131",42.44298100,-71.11144100,64
-"WP","6130",42.44219600,-71.11097500,64
-"WP","6029",42.44175400,-71.11322000,56
-"WP","6006",42.43901800,-71.11445600,56
-"WP","6014MEADOW",42.43675700,-71.11322300,38
-"WP","PANTHRCAVE",42.43498000,-71.10994200,45
-"WP","GATE6",42.43124000,-71.10923600,27
-"WP","BELLEVUE",42.43095000,-71.10762800,23
+"WP","NARVA",50.49261597,12.10544807,391
+"WP","001",50.49260315,12.10543080,0
+"WP","002",50.49260315,12.10543080,0
+"WP","003",50.49427684,12.10513039,0
+"WP","004",50.49383394,12.10610052,0
+"WP","Liebknechtstrasse",50.49383403,12.10610026,0
+"WP","005",50.49383394,12.10610052,0
+"WP","006",50.49337562,12.10710450,0
+"WP","007",50.49365977,12.10715177,0
+"WP","Jahnstrasse",50.49366664,12.10715001,0
diff --git a/reference/stmsdf-example.gpx b/reference/stmsdf-example.gpx
deleted file mode 100644 (file)
index 6e1543a..0000000
+++ /dev/null
@@ -1,585 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gpx
- version="1.0"
-creator="GPSBabel - http://www.gpsbabel.org"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns="http://www.topografix.com/GPX/1/0"
-xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
-<time>1970-01-01T00:00:00Z</time>
-<bounds minlat="30.045517000" minlon ="-91.610567000" maxlat="42.467110000" maxlon="-71.105116000" />
-<rte>
-  <rtept lat="42.430950000" lon="-71.107628000">
-    <ele>23.000000</ele>
-    <name>BELLEVUE</name>
-  </rtept>
-  <rtept lat="42.431240000" lon="-71.109236000">
-    <ele>27.000000</ele>
-    <name>GATE6</name>
-  </rtept>
-  <rtept lat="42.434980000" lon="-71.109942000">
-    <ele>45.000000</ele>
-    <name>PANTHRCAVE</name>
-  </rtept>
-  <rtept lat="42.436757000" lon="-71.113223000">
-    <ele>38.000000</ele>
-    <name>6014MEADOW</name>
-  </rtept>
-  <rtept lat="42.439018000" lon="-71.114456000">
-    <ele>56.000000</ele>
-    <name>6006</name>
-  </rtept>
-  <rtept lat="42.438594000" lon="-71.114803000">
-    <ele>46.000000</ele>
-    <name>6006BLUE</name>
-  </rtept>
-  <rtept lat="42.438917000" lon="-71.116146000">
-    <ele>45.000000</ele>
-    <name>5096</name>
-  </rtept>
-  <rtept lat="42.438878000" lon="-71.119277000">
-    <ele>45.000000</ele>
-    <name>5066</name>
-  </rtept>
-  <rtept lat="42.439227000" lon="-71.119689000">
-    <ele>58.000000</ele>
-    <name>5067</name>
-  </rtept>
-  <rtept lat="42.439993000" lon="-71.120925000">
-    <ele>54.000000</ele>
-    <name>5058ROAD</name>
-  </rtept>
-  <rtept lat="42.441727000" lon="-71.121676000">
-    <ele>67.000000</ele>
-    <name>5150TANK</name>
-  </rtept>
-  <rtept lat="42.443904000" lon="-71.122044000">
-    <ele>51.000000</ele>
-    <name>5142</name>
-  </rtept>
-  <rtept lat="42.445359000" lon="-71.122845000">
-    <ele>62.000000</ele>
-    <name>5144SUMMIT</name>
-  </rtept>
-  <rtept lat="42.447298000" lon="-71.121447000">
-    <ele>128.000000</ele>
-    <name>5156</name>
-  </rtept>
-  <rtept lat="42.449765000" lon="-71.122320000">
-    <ele>120.000000</ele>
-    <name>5148NANEPA</name>
-  </rtept>
-  <rtept lat="42.451442000" lon="-71.121746000">
-    <ele>75.000000</ele>
-    <name>5258</name>
-  </rtept>
-  <rtept lat="42.453256000" lon="-71.121211000">
-    <ele>78.000000</ele>
-    <name>5252PURPLE</name>
-  </rtept>
-  <rtept lat="42.456252000" lon="-71.119356000">
-    <ele>79.000000</ele>
-    <name>527631</name>
-  </rtept>
-  <rtept lat="42.456592000" lon="-71.119676000">
-    <ele>79.000000</ele>
-    <name>527614</name>
-  </rtept>
-  <rtept lat="42.457388000" lon="-71.119845000">
-    <ele>74.000000</ele>
-    <name>5267OBSTAC</name>
-  </rtept>
-  <rtept lat="42.458148000" lon="-71.119135000">
-    <ele>68.000000</ele>
-    <name>5278</name>
-  </rtept>
-  <rtept lat="42.459377000" lon="-71.117693000">
-    <ele>64.000000</ele>
-    <name>5289</name>
-  </rtept>
-  <rtept lat="42.464183000" lon="-71.119828000">
-    <ele>53.000000</ele>
-    <name>5374FIRE</name>
-  </rtept>
-  <rtept lat="42.465650000" lon="-71.119399000">
-    <ele>56.000000</ele>
-    <name>5376</name>
-  </rtept>
-  <rtept lat="42.465913000" lon="-71.119328000">
-    <ele>65.000000</ele>
-    <name>5376STREAM</name>
-  </rtept>
-  <rtept lat="42.467110000" lon="-71.113574000">
-    <ele>54.000000</ele>
-    <name>6328</name>
-  </rtept>
-  <rtept lat="42.466459000" lon="-71.110067000">
-    <ele>49.000000</ele>
-    <name>635722</name>
-  </rtept>
-  <rtept lat="42.466557000" lon="-71.109410000">
-    <ele>49.000000</ele>
-    <name>635783</name>
-  </rtept>
-  <rtept lat="42.463495000" lon="-71.107117000">
-    <ele>62.000000</ele>
-    <name>6373</name>
-  </rtept>
-  <rtept lat="42.465687000" lon="-71.107360000">
-    <ele>88.000000</ele>
-    <name>BEAR HILL</name>
-  </rtept>
-  <rtept lat="42.459986000" lon="-71.106170000">
-    <ele>73.000000</ele>
-    <name>6289</name>
-  </rtept>
-  <rtept lat="42.457616000" lon="-71.105116000">
-    <ele>73.000000</ele>
-    <name>6297</name>
-  </rtept>
-  <rtept lat="42.453845000" lon="-71.105206000">
-    <ele>67.000000</ele>
-    <name>6283</name>
-  </rtept>
-  <rtept lat="42.451430000" lon="-71.105413000">
-    <ele>58.000000</ele>
-    <name>6280</name>
-  </rtept>
-  <rtept lat="42.448448000" lon="-71.106158000">
-    <ele>62.000000</ele>
-    <name>6177</name>
-  </rtept>
-  <rtept lat="42.447804000" lon="-71.106624000">
-    <ele>62.000000</ele>
-    <name>6176</name>
-  </rtept>
-  <rtept lat="42.444773000" lon="-71.108882000">
-    <ele>63.000000</ele>
-    <name>6153</name>
-  </rtept>
-  <rtept lat="42.443592000" lon="-71.106301000">
-    <ele>55.000000</ele>
-    <name>6171</name>
-  </rtept>
-  <rtept lat="42.442981000" lon="-71.111441000">
-    <ele>64.000000</ele>
-    <name>6131</name>
-  </rtept>
-  <rtept lat="42.442196000" lon="-71.110975000">
-    <ele>64.000000</ele>
-    <name>6130</name>
-  </rtept>
-  <rtept lat="42.441754000" lon="-71.113220000">
-    <ele>56.000000</ele>
-    <name>6029</name>
-  </rtept>
-  <rtept lat="42.439018000" lon="-71.114456000">
-    <ele>56.000000</ele>
-    <name>6006</name>
-  </rtept>
-  <rtept lat="42.436757000" lon="-71.113223000">
-    <ele>38.000000</ele>
-    <name>6014MEADOW</name>
-  </rtept>
-  <rtept lat="42.434980000" lon="-71.109942000">
-    <ele>45.000000</ele>
-    <name>PANTHRCAVE</name>
-  </rtept>
-  <rtept lat="42.431240000" lon="-71.109236000">
-    <ele>27.000000</ele>
-    <name>GATE6</name>
-  </rtept>
-  <rtept lat="42.430950000" lon="-71.107628000">
-    <ele>23.000000</ele>
-    <name>BELLEVUE</name>
-  </rtept>
-</rte>
-<trk>
-  <desc>FILE</desc>
-<trkseg>
-<trkpt lat="30.062183000" lon="-91.610350000">
-  <ele>1.000000</ele>
-<time>2002-05-25T17:06:21Z</time>
-  <course>0.000000</course>
-  <speed>0.000000</speed>
-</trkpt>
-<trkpt lat="30.062783000" lon="-91.610567000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:09:55Z</time>
-  <course>342.600006</course>
-  <speed>1.188000</speed>
-</trkpt>
-<trkpt lat="30.062700000" lon="-91.608267000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:12:00Z</time>
-  <course>92.400002</course>
-  <speed>6.372000</speed>
-</trkpt>
-<trkpt lat="30.062333000" lon="-91.607383000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:12:48Z</time>
-  <course>115.599998</course>
-  <speed>7.092000</speed>
-</trkpt>
-<trkpt lat="30.061533000" lon="-91.605283000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:14:41Z</time>
-  <course>113.800003</course>
-  <speed>7.056000</speed>
-</trkpt>
-<trkpt lat="30.059783000" lon="-91.599400000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:17:16Z</time>
-  <course>109.000000</course>
-  <speed>13.932000</speed>
-</trkpt>
-<trkpt lat="30.057800000" lon="-91.596683000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:17:46Z</time>
-  <course>130.100006</course>
-  <speed>41.076000</speed>
-</trkpt>
-<trkpt lat="30.055383000" lon="-91.594900000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:18:20Z</time>
-  <course>147.399994</course>
-  <speed>33.804001</speed>
-</trkpt>
-<trkpt lat="30.053883000" lon="-91.592617000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:19:01Z</time>
-  <course>127.199997</course>
-  <speed>24.264000</speed>
-</trkpt>
-<trkpt lat="30.049733000" lon="-91.589750000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:20:46Z</time>
-  <course>149.100006</course>
-  <speed>18.468000</speed>
-</trkpt>
-<trkpt lat="30.049017000" lon="-91.589883000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:21:10Z</time>
-  <course>189.100006</course>
-  <speed>12.096000</speed>
-</trkpt>
-<trkpt lat="30.048800000" lon="-91.592933000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:21:51Z</time>
-  <course>265.299988</course>
-  <speed>25.884001</speed>
-</trkpt>
-<trkpt lat="30.046233000" lon="-91.596450000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:22:35Z</time>
-  <course>229.899994</course>
-  <speed>36.251999</speed>
-</trkpt>
-<trkpt lat="30.045517000" lon="-91.598717000">
-  <ele>0.000000</ele>
-<time>2002-05-25T17:23:08Z</time>
-  <course>250.000000</course>
-  <speed>25.379999</speed>
-</trkpt>
-<trkpt lat="30.047300000" lon="-91.600267000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:04:23Z</time>
-  <course>323.000000</course>
-  <speed>0.360000</speed>
-</trkpt>
-<trkpt lat="30.047000000" lon="-91.599633000">
-  <ele>2.000000</ele>
-<time>2002-05-25T18:06:04Z</time>
-  <course>118.699997</course>
-  <speed>2.484000</speed>
-</trkpt>
-<trkpt lat="30.046433000" lon="-91.599467000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:07:06Z</time>
-  <course>165.800003</course>
-  <speed>3.780000</speed>
-</trkpt>
-<trkpt lat="30.046200000" lon="-91.598950000">
-  <ele>1.000000</ele>
-<time>2002-05-25T18:08:18Z</time>
-  <course>117.500000</course>
-  <speed>2.808000</speed>
-</trkpt>
-<trkpt lat="30.046367000" lon="-91.597733000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:10:20Z</time>
-  <course>81.000000</course>
-  <speed>3.492000</speed>
-</trkpt>
-<trkpt lat="30.046350000" lon="-91.597167000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:11:09Z</time>
-  <course>92.000000</course>
-  <speed>3.996000</speed>
-</trkpt>
-<trkpt lat="30.046783000" lon="-91.596333000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:12:18Z</time>
-  <course>59.000000</course>
-  <speed>4.896000</speed>
-</trkpt>
-<trkpt lat="30.047450000" lon="-91.595200000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:14:22Z</time>
-  <course>55.799999</course>
-  <speed>3.816000</speed>
-</trkpt>
-<trkpt lat="30.047800000" lon="-91.594767000">
-  <ele>2.000000</ele>
-<time>2002-05-25T18:15:04Z</time>
-  <course>47.000000</course>
-  <speed>4.896000</speed>
-</trkpt>
-<trkpt lat="30.048250000" lon="-91.594083000">
-  <ele>1.000000</ele>
-<time>2002-05-25T18:16:14Z</time>
-  <course>52.799999</course>
-  <speed>4.248000</speed>
-</trkpt>
-<trkpt lat="30.048683000" lon="-91.593800000">
-  <ele>1.000000</ele>
-<time>2002-05-25T18:17:01Z</time>
-  <course>29.500000</course>
-  <speed>4.248000</speed>
-</trkpt>
-<trkpt lat="30.049350000" lon="-91.593850000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:18:07Z</time>
-  <course>356.299988</course>
-  <speed>4.068000</speed>
-</trkpt>
-<trkpt lat="30.050317000" lon="-91.593983000">
-  <ele>2.000000</ele>
-<time>2002-05-25T18:19:51Z</time>
-  <course>353.200012</course>
-  <speed>3.744000</speed>
-</trkpt>
-<trkpt lat="30.050783000" lon="-91.594117000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:20:39Z</time>
-  <course>346.000000</course>
-  <speed>3.996000</speed>
-</trkpt>
-<trkpt lat="30.051233000" lon="-91.594367000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:21:24Z</time>
-  <course>334.299988</course>
-  <speed>4.464000</speed>
-</trkpt>
-<trkpt lat="30.051800000" lon="-91.594367000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:22:17Z</time>
-  <course>0.000000</course>
-  <speed>4.284000</speed>
-</trkpt>
-<trkpt lat="30.052217000" lon="-91.594667000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:23:18Z</time>
-  <course>328.100006</course>
-  <speed>3.240000</speed>
-</trkpt>
-<trkpt lat="30.053017000" lon="-91.594683000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:24:37Z</time>
-  <course>359.000000</course>
-  <speed>4.068000</speed>
-</trkpt>
-<trkpt lat="30.054867000" lon="-91.595200000">
-  <ele>6.000000</ele>
-<time>2002-05-25T18:28:13Z</time>
-  <course>346.399994</course>
-  <speed>3.528000</speed>
-</trkpt>
-<trkpt lat="30.053733000" lon="-91.594933000">
-  <ele>2.000000</ele>
-<time>2002-05-25T18:31:36Z</time>
-  <course>168.500000</course>
-  <speed>2.268000</speed>
-</trkpt>
-<trkpt lat="30.053183000" lon="-91.594783000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:32:56Z</time>
-  <course>166.699997</course>
-  <speed>2.844000</speed>
-</trkpt>
-<trkpt lat="30.052633000" lon="-91.594833000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:34:02Z</time>
-  <course>184.500000</course>
-  <speed>3.348000</speed>
-</trkpt>
-<trkpt lat="30.052450000" lon="-91.595433000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:36:03Z</time>
-  <course>250.600006</course>
-  <speed>1.836000</speed>
-</trkpt>
-<trkpt lat="30.052483000" lon="-91.595967000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:36:48Z</time>
-  <course>274.100006</course>
-  <speed>4.140000</speed>
-</trkpt>
-<trkpt lat="30.052650000" lon="-91.596783000">
-  <ele>1.000000</ele>
-<time>2002-05-25T18:37:52Z</time>
-  <course>283.299988</course>
-  <speed>4.536000</speed>
-</trkpt>
-<trkpt lat="30.053133000" lon="-91.597850000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:39:18Z</time>
-  <course>297.600006</course>
-  <speed>4.860000</speed>
-</trkpt>
-<trkpt lat="30.053617000" lon="-91.597967000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:40:15Z</time>
-  <course>348.200012</course>
-  <speed>3.492000</speed>
-</trkpt>
-<trkpt lat="30.053967000" lon="-91.597767000">
-  <ele>6.000000</ele>
-<time>2002-05-25T18:41:25Z</time>
-  <course>26.299999</course>
-  <speed>2.232000</speed>
-</trkpt>
-<trkpt lat="30.053617000" lon="-91.598083000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:42:37Z</time>
-  <course>218.000000</course>
-  <speed>2.484000</speed>
-</trkpt>
-<trkpt lat="30.053200000" lon="-91.597917000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:44:01Z</time>
-  <course>161.000000</course>
-  <speed>2.088000</speed>
-</trkpt>
-<trkpt lat="30.052817000" lon="-91.597517000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:45:53Z</time>
-  <course>137.899994</course>
-  <speed>1.836000</speed>
-</trkpt>
-<trkpt lat="30.052567000" lon="-91.596933000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:46:54Z</time>
-  <course>116.300003</course>
-  <speed>3.708000</speed>
-</trkpt>
-<trkpt lat="30.052333000" lon="-91.596433000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:47:42Z</time>
-  <course>118.400002</course>
-  <speed>4.104000</speed>
-</trkpt>
-<trkpt lat="30.052250000" lon="-91.595683000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:48:41Z</time>
-  <course>97.300003</course>
-  <speed>4.428000</speed>
-</trkpt>
-<trkpt lat="30.052217000" lon="-91.595017000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:49:52Z</time>
-  <course>93.300003</course>
-  <speed>3.276000</speed>
-</trkpt>
-<trkpt lat="30.051883000" lon="-91.594700000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:50:49Z</time>
-  <course>140.600006</course>
-  <speed>3.024000</speed>
-</trkpt>
-<trkpt lat="30.051050000" lon="-91.594400000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:52:14Z</time>
-  <course>162.699997</course>
-  <speed>4.104000</speed>
-</trkpt>
-<trkpt lat="30.050567000" lon="-91.594233000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:52:56Z</time>
-  <course>163.300003</course>
-  <speed>4.824000</speed>
-</trkpt>
-<trkpt lat="30.050183000" lon="-91.594100000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:53:38Z</time>
-  <course>163.300003</course>
-  <speed>3.816000</speed>
-</trkpt>
-<trkpt lat="30.049100000" lon="-91.593717000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:55:11Z</time>
-  <course>163.000000</course>
-  <speed>4.896000</speed>
-</trkpt>
-<trkpt lat="30.048450000" lon="-91.594250000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:56:32Z</time>
-  <course>215.399994</course>
-  <speed>3.960000</speed>
-</trkpt>
-<trkpt lat="30.048083000" lon="-91.594750000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:57:24Z</time>
-  <course>229.699997</course>
-  <speed>4.356000</speed>
-</trkpt>
-<trkpt lat="30.047500000" lon="-91.595450000">
-  <ele>7.000000</ele>
-<time>2002-05-25T18:58:40Z</time>
-  <course>226.100006</course>
-  <speed>4.428000</speed>
-</trkpt>
-<trkpt lat="30.047067000" lon="-91.596000000">
-  <ele>0.000000</ele>
-<time>2002-05-25T18:59:28Z</time>
-  <course>227.699997</course>
-  <speed>5.364000</speed>
-</trkpt>
-<trkpt lat="30.046633000" lon="-91.596600000">
-  <ele>0.000000</ele>
-<time>2002-05-25T19:00:22Z</time>
-  <course>230.100006</course>
-  <speed>5.040000</speed>
-</trkpt>
-<trkpt lat="30.046400000" lon="-91.597650000">
-  <ele>0.000000</ele>
-<time>2002-05-25T19:01:41Z</time>
-  <course>255.600006</course>
-  <speed>4.752000</speed>
-</trkpt>
-<trkpt lat="30.046233000" lon="-91.598467000">
-  <ele>0.000000</ele>
-<time>2002-05-25T19:02:48Z</time>
-  <course>256.700012</course>
-  <speed>4.356000</speed>
-</trkpt>
-<trkpt lat="30.046317000" lon="-91.598967000">
-  <ele>0.000000</ele>
-<time>2002-05-25T19:03:43Z</time>
-  <course>281.000000</course>
-  <speed>3.204000</speed>
-</trkpt>
-<trkpt lat="30.046783000" lon="-91.599283000">
-  <ele>0.000000</ele>
-<time>2002-05-25T19:04:49Z</time>
-  <course>329.600006</course>
-  <speed>3.276000</speed>
-</trkpt>
-<trkpt lat="30.047133000" lon="-91.599667000">
-  <ele>0.000000</ele>
-<time>2002-05-25T19:05:57Z</time>
-  <course>316.500000</course>
-  <speed>2.844000</speed>
-</trkpt>
-</trkseg>
-</trk>
-</gpx>
diff --git a/reference/stmsdf.txt b/reference/stmsdf.txt
new file mode 100644 (file)
index 0000000..1f34515
--- /dev/null
@@ -0,0 +1,83 @@
+Grid   Lat/Lon hddd°mm.mmm'\r
+Datum  WGS 84\r
+\r
+Header Name    Description     Type    Position        Altitude        Depth   Proximity       Temperature     Display Mode    Color   Symbol  Facility        City    State   Country Date Modified   Link    Categories\r
+\r
+Waypoint       001             User Waypoint   N50 29.56 E12 06.33     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       002             User Waypoint   N50 29.56 E12 06.33     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       003             User Waypoint   N50 29.66 E12 06.31     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       004             User Waypoint   N50 29.63 E12 06.37     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       005             User Waypoint   N50 29.63 E12 06.37     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       006             User Waypoint   N50 29.60 E12 06.43     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       007             User Waypoint   N50 29.62 E12 06.43     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       Jahnstrasse             User Waypoint   N50 29.62 E12 06.43     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       Liebknechtstrasse               User Waypoint   N50 29.63 E12 06.37     0 m                             Symbol & Name   Unknown Waypoint                                                        \r
+Waypoint       NARVA           User Waypoint   N50 29.56 E12 06.33     391 m                           Symbol & Name   Unknown Waypoint                                                        \r
+\r
+\r
+Header Name    Length  Course  Waypoints       Link\r
+\r
+Route          394 m   46° true        10 waypoints    \r
+\r
+Header Waypoint Name   Distance        Leg Length      Course\r
+\r
+Route Waypoint NARVA   0 m\r
+Route Waypoint 001     2 m     2 m     221° true\r
+Route Waypoint 002     2 m     0 m     0° true\r
+Route Waypoint 003     189 m   188 m   353° true\r
+Route Waypoint 004     274 m   85 m    126° true\r
+Route Waypoint Liebknechtstrasse       274 m   0 m     299° true\r
+Route Waypoint 005     274 m   0 m     119° true\r
+Route Waypoint 006     361 m   88 m    126° true\r
+Route Waypoint 007     393 m   32 m    6° true\r
+Route Waypoint Jahnstrasse     394 m   1 m     351° true\r
+\r
+\r
+Header Name    Start Time      Elapsed Time    Length  Average Speed   Link\r
+\r
+Track  ACTIVE LOG 006  01/05/2005 15:02:47     0:33:09 653 m   1.2 kph \r
+\r
+Header Position        Time    Altitude        Depth   Leg Length      Leg Time        Leg Speed       Leg Course\r
+\r
+Trackpoint     N51 18.78 E12 24.79     01/05/2005 15:02:47     161 m   0.0 m\r
+Trackpoint     N51 18.77 E12 24.79     01/05/2005 15:03:25     154 m   0.0 m   8 m     0:00:38 0.8 kph 137° true\r
+Trackpoint     N51 18.77 E12 24.79     01/05/2005 15:03:39     148 m   0.0 m   3 m     0:00:14 0.8 kph 180° true\r
+Trackpoint     N51 18.77 E12 24.80     01/05/2005 15:04:16     139 m   0.0 m   5 m     0:00:37 0.5 kph 129° true\r
+Trackpoint     N51 18.77 E12 24.80     01/05/2005 15:05:02     145 m   0.0 m   2 m     0:00:46 0.2 kph 270° true\r
+Trackpoint     N51 18.77 E12 24.80     01/05/2005 15:05:45     134 m   0.0 m   2 m     0:00:43 0.2 kph 90° true\r
+Trackpoint     N51 18.77 E12 24.80     01/05/2005 15:06:44     131 m   0.0 m   6 m     0:00:59 0.4 kph 162° true\r
+Trackpoint     N51 18.77 E12 24.80     01/05/2005 15:07:50     130 m   0.0 m   0 m     0:01:06 0 kph   0° true\r
+Trackpoint     N51 18.76 E12 24.80     01/05/2005 15:08:19     132 m   0.0 m   3 m     0:00:29 0.4 kph 180° true\r
+Trackpoint     N51 18.77 E12 24.80     01/05/2005 15:11:16     144 m   0.0 m   6 m     0:02:57 0.1 kph 342° true\r
+Trackpoint     N51 18.77 E12 24.81     01/05/2005 15:12:34     147 m   0.0 m   16 m    0:01:18 0.7 kph 38° true\r
+Trackpoint     N51 18.78 E12 24.83     01/05/2005 15:13:18     145 m   0.0 m   27 m    0:00:44 2 kph   70° true\r
+Trackpoint     N51 18.78 E12 24.83     01/05/2005 15:13:27     145 m   0.0 m   6 m     0:00:09 2 kph   0° true\r
+Trackpoint     N51 18.78 E12 24.83     01/05/2005 15:13:37     135 m   0.0 m   2 m     0:00:10 0.7 kph 90° true\r
+Trackpoint     N51 18.79 E12 24.83     01/05/2005 15:13:46     135 m   0.0 m   6 m     0:00:09 2 kph   0° true\r
+Trackpoint     N51 18.79 E12 24.83     01/05/2005 15:14:03     136 m   0.0 m   13 m    0:00:17 3 kph   17° true\r
+Trackpoint     N51 18.80 E12 24.84     01/05/2005 15:14:16     135 m   0.0 m   11 m    0:00:13 3 kph   32° true\r
+Trackpoint     N51 18.80 E12 24.84     01/05/2005 15:14:26     139 m   0.0 m   7 m     0:00:10 2 kph   117° true\r
+Trackpoint     N51 18.80 E12 24.85     01/05/2005 15:14:30     139 m   0.0 m   4 m     0:00:04 4 kph   90° true\r
+Trackpoint     N51 18.78 E12 24.88     01/05/2005 15:15:06     141 m   0.0 m   43 m    0:00:36 4 kph   126° true\r
+Trackpoint     N51 18.78 E12 24.89     01/05/2005 15:15:27     140 m   0.0 m   18 m    0:00:21 3 kph   121° true\r
+Trackpoint     N51 18.77 E12 24.90     01/05/2005 15:15:39     140 m   0.0 m   10 m    0:00:12 3 kph   128° true\r
+Trackpoint     N51 18.78 E12 24.90     01/05/2005 15:25:31     152 m   0.0 m   4 m     0:09:52 0.0 kph 33° true\r
+Trackpoint     N51 18.78 E12 24.90     01/05/2005 15:25:40     152 m   0.0 m   0 m     0:00:09 0 kph   0° true\r
+Trackpoint     N51 18.78 E12 24.90     01/05/2005 15:29:18     155 m   0.0 m   4 m     0:03:38 0.1 kph 328° true\r
+Trackpoint     N51 18.79 E12 24.87     01/05/2005 15:30:30     149 m   0.0 m   33 m    0:01:12 2 kph   311° true\r
+Trackpoint     N51 18.79 E12 24.87     01/05/2005 15:30:37     150 m   0.0 m   2 m     0:00:07 1.0 kph 270° true\r
+Trackpoint     N51 18.79 E12 24.87     01/05/2005 15:30:47     151 m   0.0 m   8 m     0:00:10 3 kph   270° true\r
+Trackpoint     N51 18.79 E12 24.86     01/05/2005 15:30:48     151 m   0.0 m   4 m     0:00:01 14 kph  270° true\r
+Trackpoint     N51 18.80 E12 24.83     01/05/2005 15:30:52     150 m   0.0 m   38 m    0:00:04 34 kph  300° true\r
+Trackpoint     N51 18.82 E12 24.80     01/05/2005 15:30:57     150 m   0.0 m   57 m    0:00:05 41 kph  315° true\r
+Trackpoint     N51 18.84 E12 24.77     01/05/2005 15:31:03     150 m   0.0 m   47 m    0:00:06 28 kph  316° true\r
+Trackpoint     N51 18.85 E12 24.75     01/05/2005 15:31:10     150 m   0.0 m   35 m    0:00:07 18 kph  314° true\r
+Trackpoint     N51 18.88 E12 24.57     01/05/2005 15:32:38     143 m   0.0 m   210 m   0:01:28 9 kph   283° true\r
+Trackpoint     N51 18.88 E12 24.57     01/05/2005 15:32:45     141 m   0.0 m   4 m     0:00:07 2 kph   270° true\r
+Trackpoint     N51 18.88 E12 24.57     01/05/2005 15:33:17     143 m   0.0 m   0 m     0:00:32 0 kph   0° true\r
+Trackpoint     N51 18.88 E12 24.57     01/05/2005 15:33:42     139 m   0.0 m   4 m     0:00:25 0.6 kph 270° true\r
+Trackpoint     N51 18.88 E12 24.56     01/05/2005 15:33:54     139 m   0.0 m   6 m     0:00:12 2 kph   270° true\r
+Trackpoint     N51 18.88 E12 24.56     01/05/2005 15:34:04     138 m   0.0 m   0 m     0:00:10 0 kph   0° true\r
+Trackpoint     N51 18.88 E12 24.56     01/05/2005 15:34:20     139 m   0.0 m   0 m     0:00:16 0 kph   0° true\r
+Trackpoint     N51 18.88 E12 24.56     01/05/2005 15:35:45     144 m   0.0 m   0 m     0:01:25 0 kph   0° true\r
+Trackpoint     N51 18.88 E12 24.56     01/05/2005 15:35:56     145 m   0.0 m   0 m     0:00:11 0 kph   0° true\r
index 16fec8fe06212865463404b28a4062dff67f6e1c..1d5f4f51e600ef0bed542d0eece3018f83d19209 100644 (file)
@@ -3,89 +3,97 @@ FILEVERSION=1
 SOURCE=FILE
 DATUM=WGS84
 TYPE=28
-NAME=
-MINALT=1
-MAXALT=7
-MAXSPEED=11.41
-DISTANCE=7663
-DURATION=7176
-DATE=25.05.2002 19:06.21
-AVGSPEED=1.07
+NAME=ACTIVE LOG 006
+MINALT=130
+MAXALT=161
+MAXSPEED=11.42
+DISTANCE=653
+DURATION=1989
+DATE=01.05.2005 15:02.47
+AVGSPEED=0.33
 [POINTS]
-"TP",25.05.2002,19:06.21,30.062183,-91.610350,1,0.00,0.0,0
-"TP",25.05.2002,19:09.55,30.062783,-91.610567,0,0.33,342.6,69.987322
-"TP",25.05.2002,19:12.00,30.062700,-91.608267,0,1.77,92.4,291.772212
-"TP",25.05.2002,19:12.48,30.062333,-91.607383,0,1.97,115.6,386.232694
-"TP",25.05.2002,19:14.41,30.061533,-91.605283,0,1.96,113.8,607.290028
-"TP",25.05.2002,19:17.16,30.059783,-91.599400,0,3.87,109.0,1206.639952
-"TP",25.05.2002,19:17.46,30.057800,-91.596683,0,11.41,130.1,1549.068041
-"TP",25.05.2002,19:18.20,30.055383,-91.594900,0,9.39,147.4,1868.294705
-"TP",25.05.2002,19:19.01,30.053883,-91.592617,0,6.74,127.2,2144.464886
-"TP",25.05.2002,19:20.46,30.049733,-91.589750,0,5.13,149.1,2682.736085
-"TP",25.05.2002,19:21.10,30.049017,-91.589883,0,3.36,189.1,2763.464558
-"TP",25.05.2002,19:21.51,30.048800,-91.592933,0,7.19,265.3,3058.347425
-"TP",25.05.2002,19:22.35,30.046233,-91.596450,0,10.07,229.9,3501.639022
-"TP",25.05.2002,19:23.08,30.045517,-91.598717,0,7.05,250.0,3734.175753
-"TP",25.05.2002,20:04.23,30.047300,-91.600267,0,0.10,323.0,3982.577357
-"TP",25.05.2002,20:06.04,30.047000,-91.599633,2,0.69,118.7,4052.201483
-"TP",25.05.2002,20:07.06,30.046433,-91.599467,0,1.05,165.8,4117.314967
-"TP",25.05.2002,20:08.18,30.046200,-91.598950,1,0.78,117.5,4173.480978
-"TP",25.05.2002,20:10.20,30.046367,-91.597733,0,0.97,81.0,4292.216099
-"TP",25.05.2002,20:11.09,30.046350,-91.597167,0,1.11,92.0,4346.788930
-"TP",25.05.2002,20:12.18,30.046783,-91.596333,0,1.36,59.0,4440.500254
-"TP",25.05.2002,20:14.22,30.047450,-91.595200,0,1.06,55.8,4572.531980
-"TP",25.05.2002,20:15.04,30.047800,-91.594767,2,1.36,47.0,4629.618556
-"TP",25.05.2002,20:16.14,30.048250,-91.594083,1,1.18,52.8,4712.404057
-"TP",25.05.2002,20:17.01,30.048683,-91.593800,1,1.18,29.5,4767.784474
-"TP",25.05.2002,20:18.07,30.049350,-91.593850,0,1.13,356.3,4842.190720
-"TP",25.05.2002,20:19.51,30.050317,-91.593983,2,1.04,353.2,4950.596840
-"TP",25.05.2002,20:20.39,30.050783,-91.594117,0,1.11,346.0,5004.054457
-"TP",25.05.2002,20:21.24,30.051233,-91.594367,0,1.24,334.3,5059.639210
-"TP",25.05.2002,20:22.17,30.051800,-91.594367,0,1.19,0.0,5122.757362
-"TP",25.05.2002,20:23.18,30.052217,-91.594667,0,0.90,328.1,5177.442115
-"TP",25.05.2002,20:24.37,30.053017,-91.594683,0,1.13,359.0,5266.511051
-"TP",25.05.2002,20:28.13,30.054867,-91.595200,6,0.98,346.4,5478.391223
-"TP",25.05.2002,20:31.36,30.053733,-91.594933,2,0.63,168.5,5607.222276
-"TP",25.05.2002,20:32.56,30.053183,-91.594783,0,0.79,166.7,5670.130771
-"TP",25.05.2002,20:34.02,30.052633,-91.594833,0,0.93,184.5,5731.545746
-"TP",25.05.2002,20:36.03,30.052450,-91.595433,0,0.51,250.6,5792.842562
-"TP",25.05.2002,20:36.48,30.052483,-91.595967,0,1.15,274.1,5844.426835
-"TP",25.05.2002,20:37.52,30.052650,-91.596783,1,1.26,283.3,5925.219917
-"TP",25.05.2002,20:39.18,30.053133,-91.597850,0,1.35,297.6,6041.240521
-"TP",25.05.2002,20:40.15,30.053617,-91.597967,0,0.97,348.2,6096.285922
-"TP",25.05.2002,20:41.25,30.053967,-91.597767,6,0.62,26.3,6139.752934
-"TP",25.05.2002,20:42.37,30.053617,-91.598083,0,0.69,218.0,6189.200692
-"TP",25.05.2002,20:44.01,30.053200,-91.597917,0,0.58,161.0,6238.299244
-"TP",25.05.2002,20:45.53,30.052817,-91.597517,0,0.51,137.9,6295.772963
-"TP",25.05.2002,20:46.54,30.052567,-91.596933,0,1.03,116.3,6358.549677
-"TP",25.05.2002,20:47.42,30.052333,-91.596433,0,1.14,118.4,6413.318154
-"TP",25.05.2002,20:48.41,30.052250,-91.595683,0,1.23,97.3,6486.172417
-"TP",25.05.2002,20:49.52,30.052217,-91.595017,0,0.91,93.3,6550.449724
-"TP",25.05.2002,20:50.49,30.051883,-91.594700,0,0.84,140.6,6598.568036
-"TP",25.05.2002,20:52.14,30.051050,-91.594400,0,1.14,162.7,6695.698291
-"TP",25.05.2002,20:52.56,30.050567,-91.594233,0,1.34,163.3,6751.821900
-"TP",25.05.2002,20:53.38,30.050183,-91.594100,0,1.06,163.3,6796.448283
-"TP",25.05.2002,20:55.11,30.049100,-91.593717,0,1.36,163.0,6922.529370
-"TP",25.05.2002,20:56.32,30.048450,-91.594250,0,1.10,215.4,7011.261354
-"TP",25.05.2002,20:57.24,30.048083,-91.594750,0,1.21,229.7,7074.430288
-"TP",25.05.2002,20:58.40,30.047500,-91.595450,7,1.23,226.1,7168.033689
-"TP",25.05.2002,20:59.28,30.047067,-91.596000,0,1.49,227.7,7239.672577
-"TP",25.05.2002,21:00.22,30.046633,-91.596600,0,1.40,230.1,7315.017121
-"TP",25.05.2002,21:01.41,30.046400,-91.597650,0,1.32,255.6,7419.467107
-"TP",25.05.2002,21:02.48,30.046233,-91.598467,0,1.21,256.7,7500.358795
-"TP",25.05.2002,21:03.43,30.046317,-91.598967,0,0.89,281.0,7549.438075
-"TP",25.05.2002,21:04.49,30.046783,-91.599283,0,0.91,329.6,7609.589519
-"TP",25.05.2002,21:05.57,30.047133,-91.599667,0,0.79,316.5,7663.322053
+"TP",01.05.2005,15:02.47,51.312938,12.413165,161,0.00,0.0,0
+"TP",01.05.2005,15:03.25,51.312883,12.413248,154,0.22,136.9,8.478119
+"TP",01.05.2005,15:03.39,51.312855,12.413248,148,0.22,180.0,11.566578
+"TP",01.05.2005,15:04.16,51.312827,12.413304,139,0.13,128.7,16.521235
+"TP",01.05.2005,15:05.02,51.312827,12.413276,145,0.04,270.0,18.457564
+"TP",01.05.2005,15:05.45,51.312827,12.413304,134,0.05,90.0,20.393893
+"TP",01.05.2005,15:06.44,51.312772,12.413332,131,0.11,162.6,26.865457
+"TP",01.05.2005,15:07.50,51.312772,12.413332,130,0.00,0.0,26.865457
+"TP",01.05.2005,15:08.19,51.312744,12.413332,132,0.11,180.0,29.963246
+"TP",01.05.2005,15:11.16,51.312799,12.413304,144,0.04,342.7,36.443717
+"TP",01.05.2005,15:12.34,51.312911,12.413443,147,0.20,38.0,52.143218
+"TP",01.05.2005,15:13.18,51.312994,12.413804,145,0.61,69.7,78.925927
+"TP",01.05.2005,15:13.27,51.313049,12.413804,145,0.69,0.0,85.112175
+"TP",01.05.2005,15:13.37,51.313049,12.413832,135,0.19,90.0,87.042662
+"TP",01.05.2005,15:13.46,51.313105,12.413832,135,0.69,0.0,93.219581
+"TP",01.05.2005,15:14.03,51.313216,12.413887,136,0.76,17.4,106.182252
+"TP",01.05.2005,15:14.16,51.313299,12.413971,135,0.84,32.0,117.119734
+"TP",01.05.2005,15:14.26,51.313272,12.414054,139,0.66,118.0,123.688361
+"TP",01.05.2005,15:14.30,51.313272,12.414110,139,0.97,90.0,127.555149
+"TP",01.05.2005,15:15.06,51.313049,12.414610,141,1.19,125.4,170.241955
+"TP",01.05.2005,15:15.27,51.312966,12.414832,140,0.86,121.0,188.281604
+"TP",01.05.2005,15:15.39,51.312911,12.414943,140,0.82,128.6,198.174693
+"TP",01.05.2005,15:25.31,51.312938,12.414971,152,0.01,32.1,201.819955
+"TP",01.05.2005,15:25.40,51.312938,12.414971,152,0.00,0.0,201.819955
+"TP",01.05.2005,15:29.18,51.312966,12.414943,155,0.02,327.9,205.465216
+"TP",01.05.2005,15:30.30,51.313160,12.414582,149,0.46,310.7,238.629832
+"TP",01.05.2005,15:30.37,51.313160,12.414554,150,0.28,270.0,240.560315
+"TP",01.05.2005,15:30.47,51.313160,12.414443,151,0.77,270.0,248.293911
+"TP",01.05.2005,15:30.48,51.313160,12.414387,151,3.87,270.0,252.160708
+"TP",01.05.2005,15:30.52,51.313327,12.413915,150,9.43,299.5,289.898474
+"TP",01.05.2005,15:30.57,51.313688,12.413332,150,11.42,314.7,347.021422
+"TP",01.05.2005,15:31.03,51.313994,12.412860,150,7.88,316.0,394.311899
+"TP",01.05.2005,15:31.10,51.314216,12.412498,150,5.04,314.6,429.569729
+"TP",01.05.2005,15:32.38,51.314633,12.409554,143,2.39,282.8,639.630841
+"TP",01.05.2005,15:32.45,51.314633,12.409499,141,0.55,270.0,643.491682
+"TP",01.05.2005,15:33.17,51.314633,12.409499,143,0.00,0.0,643.491682
+"TP",01.05.2005,15:33.42,51.314633,12.409443,139,0.15,270.0,647.358356
+"TP",01.05.2005,15:33.54,51.314633,12.409360,139,0.48,270.0,653.161283
+"TP",01.05.2005,15:34.04,51.314633,12.409360,138,0.00,0.0,653.161283
+"TP",01.05.2005,15:34.20,51.314633,12.409360,139,0.00,0.0,653.161283
+"TP",01.05.2005,15:35.45,51.314633,12.409360,144,0.00,0.0,653.161283
+"TP",01.05.2005,15:35.56,51.314633,12.409360,145,0.00,0.0,653.161283
 [CUSTOM1]
-0,1
-3583,2
-3717,1
-4123,2
-4193,1
-4240,1
-4410,2
-4912,6
-5115,2
-5491,1
-5704,6
-6739,7
+0,161
+38,154
+52,148
+89,139
+135,145
+178,134
+237,131
+303,130
+332,132
+509,144
+587,147
+631,145
+640,145
+650,135
+659,135
+676,136
+689,135
+699,139
+703,139
+739,141
+760,140
+772,140
+1364,152
+1373,152
+1591,155
+1663,149
+1670,150
+1680,151
+1681,151
+1685,150
+1690,150
+1696,150
+1703,150
+1791,143
+1798,141
+1830,143
+1855,139
+1867,139
+1877,138
+1893,139
+1978,144
+1989,145
index ae73113276f8b315cb7f018d82a0f664377ba43f..a793e9f2c2bd66841ebba2da382b908264e1595e 100644 (file)
--- a/stmsdf.c
+++ b/stmsdf.c
@@ -95,8 +95,8 @@ static int opt_route_index_value;
 
 static
 arglist_t stmsdf_args[] = {
-       {"index", &opt_route_index, "Index of route (if more the one in source)", 
-               "1", ARGTYPE_INT, "1", NULL },
+       { "index", &opt_route_index,
+               "Index of route (if more the one in source)", "1", ARGTYPE_INT, "1", NULL },
        ARG_TERMINATOR
 };
 
@@ -410,10 +410,9 @@ calculate(const waypoint *wpt, double *dist, double *speed, double *course,
                
                time_t time;
                
-               *course = 360 - DEG(heading(
+               *course = heading_true_degrees(
                        RAD(trkpt_out->latitude), RAD(trkpt_out->longitude),
-                       RAD(wpt->latitude), RAD(wpt->longitude)));
-               if (*course >= 360) *course -= 360;
+                       RAD(wpt->latitude), RAD(wpt->longitude));
 
                *dist = radtometers(gcdist(
                        RAD(trkpt_out->latitude), RAD(trkpt_out->longitude), 
diff --git a/testo b/testo
index a27baef727836457620e258d1d8912df1feb8b71..5799ee61694730c35e3c3a81a94595d5a9083409 100755 (executable)
--- a/testo
+++ b/testo
@@ -1094,11 +1094,11 @@ compare ${TMPDIR}/sportsim.txt ${REFERENCE}/track/sportsim-sample.txt
 # Suunto SDF
 #
 rm -f ${TMPDIR}/stmsdf*
-${PNAME} -i gpx -f ${REFERENCE}/expertgps.gpx -r -o stmsdf -F ${TMPDIR}/stmsdf-route.sdf -t -o stmsdf -F ${TMPDIR}/stmsdf-track.sdf
-compare ${TMPDIR}/stmsdf-route.sdf ${REFERENCE}/route/stmsdf-route.sdf
+${PNAME} -i garmin_txt -f ${REFERENCE}/garmin_txt.txt -t -o stmsdf -F ${TMPDIR}/stmsdf-track.sdf -r -o stmsdf,index=2 -F ${TMPDIR}/stmsdf-route.sdf
 compare ${TMPDIR}/stmsdf-track.sdf ${REFERENCE}/track/stmsdf-track.sdf
-${PNAME} -i stmsdf -f ${TMPDIR}/stmsdf-route.sdf -f ${TMPDIR}/stmsdf-track.sdf -o gpx -F ${TMPDIR}/stmsdf-example.gpx
-compare ${TMPDIR}/stmsdf-example.gpx ${REFERENCE}/stmsdf-example.gpx
+compare ${TMPDIR}/stmsdf-route.sdf ${REFERENCE}/route/stmsdf-route.sdf
+${PNAME} -i stmsdf -f ${TMPDIR}/stmsdf-track.sdf -f ${TMPDIR}/stmsdf-route.sdf -o garmin_txt,prec=2 -F ${TMPDIR}/stmsdf.txt
+compare ${TMPDIR}/stmsdf.txt ${REFERENCE}/stmsdf.txt
 
 
 exit 0